bitkeeper revision 1.1159.258.136 (428af5483Yn2FWcrPnTRD2GVmftlhQ)

Fallback behaviour of the network startup script is now same as it
always was: IP addresses of eth0 are transferred to the bridge device
but not deleted from eth0. This is needed for the 2.0-series tools,
which by default look only at eth0 to determine IP parameters for domU.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/examples/network b/tools/examples/network
index 891a82d71eaaea06020e42e44bc7f6c9b19bf358..c8b414fe6d6154dae9c48f679275c339644c643a 100755 (executable)
--- a/tools/examples/network
+++ b/tools/examples/network
@@ -185,7 +185,6 @@ op_start () {
     else
         transfer_addrs ${netdev} ${bridge}
         transfer_routes ${netdev} ${bridge}
-        del_addrs ${netdev}
     fi
 
     # Attach the real interface to the bridge.
@@ -216,9 +215,7 @@ op_stop () {
         ifconfig veth0 -arp down
         ifconfig veth0 hw ether 00:00:00:00:00:00
     else
-        transfer_addrs ${bridge} ${netdev}
         transfer_routes ${bridge} ${netdev}
-        del_addrs ${bridge}
     fi
 }